Made filled resin holes and weed nodes destroyable by xenos #3711

JackieEstegado · 2023-06-24T11:40:58Z

About the pull request

Made weed nodes destroyable with the plant weeds button.
Made filled resin holes destroyable by harm intent click, with a hive-wide message telling about it to avoid griefing going unnoticed. It does constitute a bit of a buff, due to it being usable for extinguishing yourself.
Both have a short windup delay to avoid accidental use.

Explain why it's good for the game

If a resin hole gets filled it becomes unremovable by xenos until something triggers it, no reason for it to work like that, was just annoying if a badly placed hole got filled.

Pretty much the same for weeds, nice to be able to remove weeds when trying to be stealthy, not giving away your presence (For example the west LZ2 wall on BR when you are doing a Mining Hive and some XX drone weeded it).

Testing Photographs and Procedure

Tested every possible shenanigans I could think of relating to these two things.

Changelog

🆑
qol: Weed nodes are now removable with the 'plant weeds' ability.
balance: Acid filled resin holes can now be destroyed by xenos via clicking on them with harm intent.
/:cl:

github-actions · 2023-06-24T11:41:49Z

You currently have a negative Fix/Feature pull request delta of -1. Maintainers may close this PR at will. Fixing issues or improving the codebase will improve this score.

Drulikar

I'm not really keen on this, but I'm hardly the last say.

However, I would like this to be tied in with a queen setting that a queen can opt-in to having much like the existing construction_toggle and destruction_toggle options have levels for no-one, leaders, and everyone. Preferably where the setting is off by default (existing behavior).

Drulikar · 2023-06-24T12:01:47Z

code/modules/cm_aliens/structures/trap.dm

@@ -217,6 +217,20 @@
 			to_chat(X, SPAN_XENONOTICE("[src] is occupied by a child."))
 			return XENO_NO_DELAY_ACTION

+	if(X.a_intent == INTENT_HARM)


Please fix the single letter vars as you need to modify code. See https://github.com/cmss13-devs/cmss13/blob/master/.github/guides/STYLES.md#variables

In VSC its very easy to do this, just ctrl+f, highlight the entire proc block, press the paragraph looking button to restrict search to selection, match case, and match word, and then dropdown to reveal replace.

Have the queen option for both of them, in separate toggles?

Search for one of those options and you'll see what I mean. It's a single setting with 3 possible states. I think you can have both weed destruction and trap destruction together in the same setting. But up to you.

Drulikar · 2023-06-24T12:01:53Z

code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm

@@ -27,8 +27,16 @@
 		return

 	var/obj/effect/alien/weeds/node/N = locate() in T
-	if(N && N.weed_strength >= X.weed_level)
-		to_chat(X, SPAN_WARNING("There's a pod here already!"))
+	if(N)


Please fix the single letter vars as you need to modify code.

Drulikar · 2023-06-24T12:03:14Z

code/modules/cm_aliens/structures/trap.dm

@@ -217,6 +217,20 @@
 			to_chat(X, SPAN_XENONOTICE("[src] is occupied by a child."))
 			return XENO_NO_DELAY_ACTION

+	if(X.a_intent == INTENT_HARM)
+		to_chat(X, SPAN_XENONOTICE("You start tearing away at the hole."))
+		xeno_attack_delay(X)


I don't think there's really any point to add an attack delay before a do_after.

Drulikar · 2023-06-24T12:04:43Z

code/modules/cm_aliens/structures/trap.dm

+	if(X.a_intent == INTENT_HARM)
+		to_chat(X, SPAN_XENONOTICE("You start tearing away at the hole."))
+		xeno_attack_delay(X)
+		if(!do_after(X, 30, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, src))


Use the time macros. E.g. 3 SECONDS See https://github.com/cmss13-devs/cmss13/blob/master/.github/guides/STYLES.md#use-our-time-defines

Drulikar · 2023-06-24T12:07:38Z

code/modules/cm_aliens/structures/trap.dm

+		to_chat(X, SPAN_XENONOTICE("You destroy the trap."))
+		for(var/mob/living/carbon/xenomorph/Xeno in GLOB.living_xeno_list)
+			if(Xeno.hivenumber == hivenumber)
+				to_chat(Xeno, SPAN_XENOMINORWARNING("One of your Hive's traps at [A.name] has been torn apart by [X]!"))


To match the wording of /obj/effect/alien/resin/trap/proc/trigger_trap:

Suggested change

to_chat(Xeno, SPAN_XENOMINORWARNING("One of your Hive's traps at [A.name] has been torn apart by [X]!"))

to_chat(Xeno, SPAN_XENOMINORWARNING("You sense one of your Hive's traps at [A.name] has been torn apart by [X]!"))

Drulikar · 2023-06-24T12:11:02Z

code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm

+			if(!do_after(X, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
+				return
+			playsound(X.loc, "alien_resin_break", 25)
+			N.Destroy()


Use qdel instead of directly calling what qdel calls.

Drulikar · 2023-06-24T12:11:14Z

code/modules/cm_aliens/structures/trap.dm

+			return XENO_NO_DELAY_ACTION
+		var/area/A = get_area(src)
+		if (X.hivenumber == hivenumber)
+			Destroy()


Use qdel instead of directly calling what qdel calls.

Drulikar · 2023-06-24T12:11:37Z

code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm

+			to_chat(X, SPAN_WARNING("There's a pod here already!"))
+		else
+			to_chat(X, SPAN_WARNING("You start removing the resin node."))
+			if(!do_after(X, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))


Use the time macros. E.g. 1 SECONDS See https://github.com/cmss13-devs/cmss13/blob/master/.github/guides/STYLES.md#use-our-time-defines

github-actions · 2023-07-02T02:00:53Z

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

Rigó János added 2 commits June 24, 2023 13:23

Made weed nodes destroyable

f800ffe

Made filled traps destroyable

354f85e

github-actions bot added Quality of Life Make the game harder to play Balance You need to be a professional veteran game maintainer to comprehend what is being done here. labels Jun 24, 2023

Drulikar requested changes Jun 24, 2023

View reviewed changes

Drulikar marked this pull request as draft June 24, 2023 12:12

github-actions bot added the Stale beg a maintainer to review your PR label Jul 2, 2023

cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 5, 2023

JackieEstegado closed this Jul 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Made filled resin holes and weed nodes destroyable by xenos #3711

Made filled resin holes and weed nodes destroyable by xenos #3711

JackieEstegado commented Jun 24, 2023 •

edited by github-actions bot

Loading

github-actions bot commented Jun 24, 2023

Drulikar left a comment

Drulikar Jun 24, 2023

Drulikar Jun 24, 2023

JackieEstegado Jun 24, 2023

Drulikar Jun 24, 2023 •

edited

Loading

Drulikar Jun 24, 2023

Drulikar Jun 24, 2023

Drulikar Jun 24, 2023

Drulikar Jun 24, 2023

Drulikar Jun 24, 2023

Drulikar Jun 24, 2023

Drulikar Jun 24, 2023

github-actions bot commented Jul 2, 2023

	to_chat(Xeno, SPAN_XENOMINORWARNING("One of your Hive's traps at [A.name] has been torn apart by [X]!"))
	to_chat(Xeno, SPAN_XENOMINORWARNING("You sense one of your Hive's traps at [A.name] has been torn apart by [X]!"))

Made filled resin holes and weed nodes destroyable by xenos #3711

Made filled resin holes and weed nodes destroyable by xenos #3711

Conversation

JackieEstegado commented Jun 24, 2023 • edited by github-actions bot Loading

About the pull request

Explain why it's good for the game

Testing Photographs and Procedure

Changelog

github-actions bot commented Jun 24, 2023

Drulikar left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Drulikar Jun 24, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jul 2, 2023

JackieEstegado commented Jun 24, 2023 •

edited by github-actions bot

Loading

Drulikar Jun 24, 2023 •

edited

Loading